PyPI - bouquin - Versions diffs - 0.1.12__py3-none-any.whl → 0.2.1.2__py3-none-any.whl - Mend

bouquin 0.1.12py3-none-any.whl → 0.2.1.2py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

bouquin/db.py +4 -41
bouquin/find_bar.py +33 -11
bouquin/history_dialog.py +27 -26
bouquin/main_window.py +495 -120
bouquin/markdown_editor.py +813 -0
bouquin/search.py +46 -30
bouquin/toolbar.py +0 -42
{bouquin-0.1.12.dist-info → bouquin-0.2.1.2.dist-info}/METADATA +5 -7
bouquin-0.2.1.2.dist-info/RECORD +21 -0
bouquin/editor.py +0 -1009
bouquin-0.1.12.dist-info/RECORD +0 -21
{bouquin-0.1.12.dist-info → bouquin-0.2.1.2.dist-info}/LICENSE +0 -0
{bouquin-0.1.12.dist-info → bouquin-0.2.1.2.dist-info}/WHEEL +0 -0
{bouquin-0.1.12.dist-info → bouquin-0.2.1.2.dist-info}/entry_points.txt +0 -0

bouquin/db.py CHANGED Viewed

@@ -3,10 +3,8 @@ from __future__ import annotations
 import csv
 import html
 import json
-import os
 from dataclasses import dataclass
-from markdownify import markdownify as md
 from pathlib import Path
 from sqlcipher3 import dbapi2 as sqlite
 from typing import List, Sequence, Tuple
@@ -401,25 +399,13 @@ class DBManager:
         Export to HTML, similar to export_html, but then convert to Markdown
         using markdownify, and finally save to file.
         """
-        parts = [
-            "<!doctype html>",
-            '<html lang="en">',
-            "<body>",
-            f"<h1>{html.escape(title)}</h1>",
-        ]
+        parts = []
         for d, c in entries:
-            parts.append(
-                f"<article><header><time>{html.escape(d)}</time></header><section>{c}</section></article>"
-            )
-        parts.append("</body></html>")
-        # Convert html to markdown
-        md_items = []
-        for item in parts:
-            md_items.append(md(item, heading_style="ATX"))
+            parts.append(f"# {d}")
+            parts.append(c)
         with open(file_path, "w", encoding="utf-8") as f:
-            f.write("\n".join(md_items))
+            f.write("\n".join(parts))
     def export_sql(self, file_path: str) -> None:
         """
@@ -440,29 +426,6 @@ class DBManager:
         cur.execute("SELECT sqlcipher_export('backup')")
         cur.execute("DETACH DATABASE backup")
-    def export_by_extension(self, file_path: str) -> None:
-        """
-        Fallback catch-all that runs one of the above functions based on
-        the extension of the file name that was chosen by the user.
-        """
-        entries = self.get_all_entries()
-        ext = os.path.splitext(file_path)[1].lower()
-        if ext == ".json":
-            self.export_json(entries, file_path)
-        elif ext == ".csv":
-            self.export_csv(entries, file_path)
-        elif ext == ".txt":
-            self.export_txt(entries, file_path)
-        elif ext in {".html", ".htm"}:
-            self.export_html(entries, file_path)
-        elif ext in {".sql", ".sqlite"}:
-            self.export_sql(file_path)
-        elif ext == ".md":
-            self.export_markdown(entries, file_path)
-        else:
-            raise ValueError(f"Unsupported extension: {ext}")
     def compact(self) -> None:
         """
         Runs VACUUM on the db.

bouquin/find_bar.py CHANGED Viewed

@@ -21,9 +21,8 @@ from PySide6.QtWidgets import (
 class FindBar(QWidget):
     """Widget for finding text in the Editor"""
-    closed = (
-        Signal()
-    )  # emitted when the bar is hidden (Esc/✕), so caller can refocus editor
+    # emitted when the bar is hidden (Esc/✕), so caller can refocus editor
+    closed = Signal()
     def __init__(
         self,
@@ -31,16 +30,21 @@ class FindBar(QWidget):
         shortcut_parent: QWidget | None = None,
         parent: QWidget | None = None,
     ):
         super().__init__(parent)
-        self.editor = editor
-        # UI
+        # store how to get the current editor
+        self._editor_getter = editor if callable(editor) else (lambda: editor)
+        self.shortcut_parent = shortcut_parent
+        # UI (build ONCE)
         layout = QHBoxLayout(self)
         layout.setContentsMargins(6, 0, 6, 0)
         layout.addWidget(QLabel("Find:"))
         self.edit = QLineEdit(self)
-        self.edit.setPlaceholderText("Type to search…")
+        self.edit.setPlaceholderText("Type to search")
         layout.addWidget(self.edit)
         self.case = QCheckBox("Match case", self)
@@ -56,11 +60,15 @@ class FindBar(QWidget):
         self.setVisible(False)
-        # Shortcut escape key to close findBar
-        sp = shortcut_parent if shortcut_parent is not None else (parent or self)
-        self._scEsc = QShortcut(Qt.Key_Escape, sp, activated=self._maybe_hide)
+        # Shortcut (press Esc to hide bar)
+        sp = (
+            self.shortcut_parent
+            if self.shortcut_parent is not None
+            else (self.parent() or self)
+        )
+        QShortcut(Qt.Key_Escape, sp, activated=self._maybe_hide)
-        # Signals
+        # Signals (connect ONCE)
         self.edit.returnPressed.connect(self.find_next)
         self.edit.textChanged.connect(self._update_highlight)
         self.case.toggled.connect(self._update_highlight)
@@ -68,10 +76,17 @@ class FindBar(QWidget):
         self.prevBtn.clicked.connect(self.find_prev)
         self.closeBtn.clicked.connect(self.hide_bar)
+    @property
+    def editor(self) -> QTextEdit | None:
+        """Get the current editor"""
+        return self._editor_getter()
     # ----- Public API -----
     def show_bar(self):
         """Show the bar, seed with current selection if sensible, focus the line edit."""
+        if not self.editor:
+            return
         tc = self.editor.textCursor()
         sel = tc.selectedText().strip()
         if sel and "\u2029" not in sel:  # ignore multi-paragraph selections
@@ -105,6 +120,8 @@ class FindBar(QWidget):
         return flags
     def find_next(self):
+        if not self.editor:
+            return
         txt = self.edit.text()
         if not txt:
             return
@@ -130,6 +147,8 @@ class FindBar(QWidget):
         self._update_highlight()
     def find_prev(self):
+        if not self.editor:
+            return
         txt = self.edit.text()
         if not txt:
             return
@@ -155,6 +174,8 @@ class FindBar(QWidget):
         self._update_highlight()
     def _update_highlight(self):
+        if not self.editor:
+            return
         txt = self.edit.text()
         if not txt:
             self._clear_highlight()
@@ -183,4 +204,5 @@ class FindBar(QWidget):
         self.editor.setExtraSelections(selections)
     def _clear_highlight(self):
-        self.editor.setExtraSelections([])
+        if self.editor:
+            self.editor.setExtraSelections([])

bouquin/history_dialog.py CHANGED Viewed

@@ -16,31 +16,33 @@ from PySide6.QtWidgets import (
 )
-def _html_to_text(s: str) -> str:
-    """Lightweight HTML→text for diff (keeps paragraphs/line breaks)."""
-    IMG_RE = re.compile(r"(?is)<img\b[^>]*>")
-    STYLE_SCRIPT_RE = re.compile(r"(?is)<(script|style)[^>]*>.*?</\1>")
-    COMMENT_RE = re.compile(r"<!--.*?-->", re.S)
-    BR_RE = re.compile(r"(?i)<br\s*/?>")
-    BLOCK_END_RE = re.compile(r"(?i)</(p|div|section|article|li|h[1-6])\s*>")
-    TAG_RE = re.compile(r"<[^>]+>")
-    MULTINL_RE = re.compile(r"\n{3,}")
-    s = IMG_RE.sub("[ Image changed - see Preview pane ]", s)
-    s = STYLE_SCRIPT_RE.sub("", s)
-    s = COMMENT_RE.sub("", s)
-    s = BR_RE.sub("\n", s)
-    s = BLOCK_END_RE.sub("\n", s)
-    s = TAG_RE.sub("", s)
-    s = _html.unescape(s)
-    s = MULTINL_RE.sub("\n\n", s)
+def _markdown_to_text(s: str) -> str:
+    """Convert markdown to plain text for diff comparison."""
+    # Remove images
+    s = re.sub(r"!\[.*?\]\(.*?\)", "[ Image ]", s)
+    # Remove inline code formatting
+    s = re.sub(r"`([^`]+)`", r"\1", s)
+    # Remove bold/italic markers
+    s = re.sub(r"\*\*([^*]+)\*\*", r"\1", s)
+    s = re.sub(r"__([^_]+)__", r"\1", s)
+    s = re.sub(r"\*([^*]+)\*", r"\1", s)
+    s = re.sub(r"_([^_]+)_", r"\1", s)
+    # Remove strikethrough
+    s = re.sub(r"~~([^~]+)~~", r"\1", s)
+    # Remove heading markers
+    s = re.sub(r"^#{1,6}\s+", "", s, flags=re.MULTILINE)
+    # Remove list markers
+    s = re.sub(r"^\s*[-*+]\s+", "", s, flags=re.MULTILINE)
+    s = re.sub(r"^\s*\d+\.\s+", "", s, flags=re.MULTILINE)
+    # Remove checkbox markers
+    s = re.sub(r"^\s*-\s*\[[x ☐☑]\]\s+", "", s, flags=re.MULTILINE)
     return s.strip()
-def _colored_unified_diff_html(old_html: str, new_html: str) -> str:
+def _colored_unified_diff_html(old_md: str, new_md: str) -> str:
     """Return HTML with colored unified diff (+ green, - red, context gray)."""
-    a = _html_to_text(old_html).splitlines()
-    b = _html_to_text(new_html).splitlines()
+    a = _markdown_to_text(old_md).splitlines()
+    b = _markdown_to_text(new_md).splitlines()
     ud = difflib.unified_diff(a, b, fromfile="current", tofile="selected", lineterm="")
     lines = []
     for line in ud:
@@ -116,9 +118,9 @@ class HistoryDialog(QDialog):
         return local.strftime("%Y-%m-%d %H:%M:%S %Z")
     def _load_versions(self):
-        self._versions = self._db.list_versions(
-            self._date
-        )  # [{id,version_no,created_at,note,is_current}]
+        # [{id,version_no,created_at,note,is_current}]
+        self._versions = self._db.list_versions(self._date)
         self._current_id = next(
             (v["id"] for v in self._versions if v["is_current"]), None
         )
@@ -150,9 +152,8 @@ class HistoryDialog(QDialog):
             self.btn_revert.setEnabled(False)
             return
         sel_id = item.data(Qt.UserRole)
-        # Preview selected as HTML
         sel = self._db.get_version(version_id=sel_id)
-        self.preview.setHtml(sel["content"])
+        self.preview.setMarkdown(sel["content"])
         # Diff vs current (textual diff)
         cur = self._db.get_version(version_id=self._current_id)
         self.diff.setHtml(_colored_unified_diff_html(cur["content"], sel["content"]))

bouquin 0.1.12__py3-none-any.whl → 0.2.1.2__py3-none-any.whl

bouquin 0.1.12py3-none-any.whl → 0.2.1.2py3-none-any.whl